Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 22:51:38 +0000 (14:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 22:51:38 +0000 (14:51 -0800)
commit098ff10977b083c4cce8b2e319ca6d70bb1f3493
treeda5cb19767a56126f797ba41bbb86c53e6466b61
parent7498a5c2d9c9724f2e5a4c48d856e0dbe399790d
parentb083e5e619bd114440e09cd9d0a5d84af04a6e55
Merge from mainline.